merge trunk
authorKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 00:23:02 +0000 (09:23 +0900)
committerKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 00:23:02 +0000 (09:23 +0900)
commitc09124c77ece9d7222e0ae34027b11bca238fbc6
tree305855fc8891aede883e430d2a3e058a260e2806
parente6df348bbbd24bcd0f4c654020f126b70ae50d1f
parentc0f0afca96500886eecfdedae080285383e273a7
merge trunk